Move nullptr_t to unversioned namespace: Sean Hunt git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@132665 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/cstddef b/include/cstddef index 3da9659..53ef272 100644 --- a/include/cstddef +++ b/include/cstddef
@@ -84,12 +84,17 @@ #define nullptr _STD::__get_nullptr_t() -#else // _LIBCPP_HAS_NO_NULLPTR - -typedef decltype(nullptr) nullptr_t; - #endif // _LIBCPP_HAS_NO_NULLPTR _LIBCPP_END_NAMESPACE_STD +#ifndef _LIBCPP_HAS_NO_NULLPTR + +namespace std +{ + typedef decltype(nullptr) nullptr_t; +} + +#endif // _LIBCPP_HAS_NO_NULLPTR + #endif // _LIBCPP_CSTDDEF 